From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 1 Feb 2013 00:22:15 +0000 (+0100)
Subject: keyboard: Fix a warning
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4992
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=65bf0d20e74bd5972e19341561f2c79ba77d1ea9;p=gnome-shell.git

keyboard: Fix a warning

While we handle the case where ibus_bus_get_global_engine() returns
NULL, this case actually generates an exception we have to catch to
avoid some (harmless) console spam.

https://bugzilla.gnome.org/show_bug.cgi?id=692995
---

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index f09141846..15e14d83a 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -115,9 +115,14 @@ const IBusManager = new Lang.Class({
             this._panelService.connect('update-property', Lang.bind(this, this._updateProperty));
             // If an engine is already active we need to get its properties
             this._ibus.get_global_engine_async(-1, null, Lang.bind(this, function(i, result) {
-                let engine = this._ibus.get_global_engine_async_finish(result);
-                if (!engine)
+                let engine;
+                try {
+                    engine = this._ibus.get_global_engine_async_finish(result);
+                    if (!engine)
+                        return;
+                } catch(e) {
                     return;
+                }
                 this._engineChanged(this._ibus, engine.get_name());
             }));
             this._updateReadiness();